SQL Format Support ON CONFLICT #293
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
xterao
force-pushed
the
feature/sql-format-support-on-conflict
branch
from
0ee229d to
19261b7
Compare
xterao
force-pushed
the
feature/sql-format-support-on-conflict
branch
from
19261b7 to
7be9abb
Compare
Contributor
There was a problem hiding this comment.
Pull Request Overview
This PR introduces enhanced formatting support for SQL upsert statements using the ON CONFLICT clause. The updates include new test cases for various ON CONFLICT patterns, modifications to how conflict and DO clauses are handled in formatter block utilities, and minor refactoring in test configuration for consistent file naming.
Reviewed Changes
Copilot reviewed 34 out of 38 changed files in this pull request and generated 1 comment.
| File | Description |
|---|---|
| src/test/testData/sql/formatter/InsertConflictUpdate*.sql | Added/updated tests to verify proper formatting of INSERT statements with ON CONFLICT clauses. |
| src/test/kotlin/org/domaframework/doma/intellij/formatter/SqlFormatterTest.kt | Updated test naming using a new formatDataPrefix variable for consistency. |
| src/main/kotlin/org/domaframework/doma/intellij/formatter/util/SqlBlockUtil.kt | Introduced and refined formatting handling for conflict-related blocks (e.g. CONFLICT, DO, etc.). |
| Other Kotlin formatter and block files | Various adjustments and import refactorings to support new conflict clause support in SQL formatting. |
Comments suppressed due to low confidence (2)
src/test/kotlin/org/domaframework/doma/intellij/formatter/SqlFormatterTest.kt:30
- [nitpick] Consider adding a brief inline comment explaining the purpose of the formatDataPrefix variable to clarify its role in constructing expected test filenames.
private val formatDataPrefix = "_format"
src/main/kotlin/org/domaframework/doma/intellij/formatter/block/group/keyword/update/SqlUpdateValueGroupBlock.kt:52
- [nitpick] Consider expanding or updating this TODO comment to indicate a plan for creating a dedicated class for update values to improve clarity and maintainability.
// TODO Update Values用のクラスを作る
src/main/kotlin/org/domaframework/doma/intellij/formatter/util/SqlBlockUtil.kt
Outdated
Show resolved
Hide resolved
Co-authored-by: Copilot <[email protected]>
xterao
force-pushed
the
feature/sql-format-support-on-conflict
branch
from
51821f2 to
03edac5
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Support formatting for upsert statements using the
ON CONFLICT DO [NOTHING | UPDATE]syntax.This includes proper indentation and line breaking rules for
ON CONFLICT, optionalON CONSTRAINT, and theDOclause with its associated update logic.